PSR-2 refactoring
small fixes