Some tidying up

Change-Id: Ib7d652e50b421571c1716dc3fd566cb823a1780e