Minor refactoring of constants