Code cleanup for phpcs

Change-Id: I2419c904629e02e1ec4cb24325acd0e2db1297db