Shorten lines to pass phpcs test

Change-Id: I5588e1f16f1a23d77160cd180058bd2000a93ab6