Fixed string comparison

Standardized all string comparison cases I could find by searching.