clean-up, comments added