Psr refactoring