Tidied up comparisons