applied fixes suggested by PHPCS