Some code tidying

Change-Id: Iedbe9dce853a1fb9e45219f1eddb30dd949a2819