Small cleanup and reordering

Change-Id: I11451c6cc925fc85f74b7be53e04e0f86ce18837