Refactor

* DRY things up.
* Human readable command types