Assorted formatting and commenting changes.