Refactored using constants