coding standards and simplification of else cases as well as some fixes

* Most (and per CS) breaks are correctly, set. But some not. Unified this.
* Some missing docblock or correct return statements for CLI
* Simplication of else