Refactoring options classes
Options eye-candy and formatting improved