clean up comments

fix usage of constants