Refactor for PSR-2 compatibility