refactor constants
move some stuff