Use proper constants