minor refactoring of constants