Minor formatting / tweaks for PSR-1 and PSR-2 compatibility