This change removes some redundant checking at setup time and splits the long parameter lists into one argument per line lists
This change removes some redundant checking at setup time and splits the long parameter lists into one argument per line lists