Code formatting for PSR1 & PSR2 - Part 1