refactored dict keys to constants