Some small code style fixes to be more PSR2 compliant

Some small code style changes to be more PSR2 compliant.