phpcs and fixes returns