Reorder methods

Change-Id: Id8f7e2d6515c61c8d0eed2975a005a848c474162