Re-ordered config paramaters in code to match option/required in help text