Refactor to fit PSR-2 standard