PSR-2 code cleanup