refactor move constants