code cleanup, PSR-1/2