Remove the use of constants to simply logic