Some pretty small fixes to be more PSR2 compliant

Some small fixes to be more PSR2 compliant, it's almost nothing...