More cleanup of constants

More cleanup of constants