Tidied up compare