refactored hardcoded constants