Fix the code to be PSR-2 compliant
Merged in the psr2 compliant code