I cleaned up the ordering.  It is more plain to see just looking at the file rather than this diff.