All unnecessary string comparison removed