modify call and refactoring of some constants