stripped out CRs, reindented everything