Filled in options based on simplifed strategy of assigning class
variables in main. Cleaned up and added some whitespace.