minor psr-0 refactoring