CC-9 Making constants more readable