Some pretty small fixes to be more PSR2 compliant