fix some phpcs/psr2 stuff
Fix more phpcs stuff