Cleaned up comparison