Clean up the command handler.

Save cycles by reducing the number of comparisons and tags to be parsed.
Merge pull request #12 from AnthonyAMC/patch-1

Clean up the command handler.