clean-up
added comments