Cleanups for PHP coding standards