Fix comments and clean-up.