Some tidy work

Change-Id: I38506ddeec9d5ea23ab98c33fb355e7bbbf1f573