cleanup, reformatting, minor edits