Bringing all files into compliance with PSR-1 and PSR-2.
More PSR-1/PSR-2 fixes.