Removing unused code
better Design (using cardslib)