Removed the hardcoded strings