[TASK] Refactorings based on the angular-styleguide

More is coming.
Merge pull request #2031 from vhpoet/develop

[TASK] Refactorings based on the angular-styleguide