Refactoring of constants completed