constants refactoring