A bunch of Minor cleanups