fixed 2 string comparisons and auto-formatted