More minor style changes, correcting sins