Refactor to conform with PSR-1