Refactored constants variables. Fixed issue when deleting all from Dec 31st