More comments and clean-ups