PSR-1 and PSR-2 fixes via http://cs.sensiolabs.org/