Fixes some non-PSR2 coding