fix #7 and cleanups
fix #7 and cleanups

Maroben/MoblerCards,phish108/MoblerCards,Maroben/MoblerCards,Maroben/MoblerCards,phish108/MoblerCards,Maroben/MoblerCards,Maroben/MoblerCards,phish108/MoblerCards,phish108/MoblerCards,phish108/MoblerCards