comments added and clean-up