Refactoring

Refactoring of constants used in logic