PSR-2 refactoring