some comments and clean-ups