A bunch of cleanup

Cool?