Hardcoded strings replaced with constants