Removed some excess comparisons