Code cleanup, PSR2 compatible