Added some card helpers
Some refactoring (announcement renamed to contract, card color renamed to card suit)