Minor clean-up of constants