Commands cleanup

CS fixes to make the code PSR-2 correct and updating some docblocks in the process