Code cleanup based on PhpStorm inspector
Add colors to CLI applications
Fix failing unit tests