tidy up cards class