Eliminate redundancies in Cards.h and Marketplace.h