clean-up comments, consts