Refactor Commands for easier maintenance.
Fixes coding style formatting errors in 3cd08e30bcfbb42e05df851dcc3093df6869731c.
Merge pull request #238 from TVPT/command-api-refactor

Temporary Command API Refactor