WIP: Refactor argument parser
Refactored option parsing