Clarified code with var and method names
Broke down options parser into smaller classes for readability