Style changes, and fixed up some stuff