Clean up and re-order

A no-op change to clean up and re-order things more clearly.

Change-Id: I5d154a4002d08ffd766d1ef81c1f8d610fa4ed50