Grady/reorder

clean up?