refactor constants
complete refactoring