Clean up phpcs

A no-op change to clean up and move related things closer together.

Change-Id: I1f198977611e923990c73ce65fc0f4e462daa101