Cleanup on CLI app, sync PHPCS
Merge pull request #227 from joomla/cliCleanup

Cleanup on CLI app, sync PHPCS