PSR-2 code clean up