Code cleanup
PSR-2 fire