Minor cleanups in style, still a way to go.