Refactoring of constants