Some PSR-2 style fixes
Merge branch 'feature-psr2'