Made a refactor of the constants