Cleaning up Cards.js