PHPCS whitespace fixes

remove trailing spaces; add spaces as PHPCS requests