Removed some hardcoded strings - minor code cleanup