Whitespace & other minor fixes
New version
Removed 'on' in the options list