comments and clean-up