commenting and clean-up