Code formatting and cleanup with php-cs-fixer