Minor reordering and newline edits