add/modify comments; delete unused code.