clean-up, old comments removed, new one-line comments added.