Code tidy

Change-Id: If2d4d1c491b187f70acb82580708b151daaa4701