Refactored some Card compare