A bunch of cleanup changes