Fix PSR-2 issues. Add small naming refactorings.