Fix PSR-1 & PSR-2 code standards