Code cleaning and PHPCS.