More tidying

Change-Id: I26c6ceaf1990e61f06995aba75c18a4051b7188e