added more string values and formatted code