Hardcoded constants removed