formatting cleanup
Work putting pieces where they actually belong