Cleaned options, restructured code organization
Formatted code