Applyed drawing cards / Refactoring