command_parser.py cleaned up a little.