psr-2 refactoring