Clean up compare to use the tuple. Thanks @olasd