Removed hardcoded string values