removed commented lines, added new comments