[#300] Refactor CLI Argument Parsing