Minor code cleanup

Change-Id: I5680cf5daa26f9bfd8ad3843273d764ea8aea4f3