Small chenge to make code easier to read

Change-Id: I4fd5bd42f633f1037ca8a226a0062d95bfa02d18