psr2, refactoring