Refactorice and set CONSTANTS