Cleanup parse_args() to be cleaner and if logic in main() more readable.

Cleanup parse_args() to be cleaner and if logic in main() more readable. #39