more minor reformatting