PSR refactoring