Alpha 2: PHPCS code quality improvements