Consolidated option argument parsing back into one function