Refactor hand & card