Removed some hardcoded strings