Cleaned up the command parser.
Refactoring