[TASK] Refactorings based on the angular-styleguide

More is coming.