Changing code for PSR-2 standards; improving readability
Plowing on with the coding formatting...
Finished off PSR-2 upgrade