Tidy-up of constants
Use of constant
Revised
updated by release process