phpcs_fixer pass

Code is a bit less ugly now..