Small tidy up

Change-Id: I7bed97f6f5301b0fc0b27ce7688b9e89e34be514