Slight rearranging

Change-Id: I98af2e52089524fb87be7a7cba87d4dbf7c5d4fb