Refactor to psr-2