phpcs and cleanup