Cleanup and reorder

Change-Id: Id04187b036ab276cf620dd543eee13416aaec81c