Refactor for psr-0