cleaned up some crufty code: unnecessary indents and the like