Refactoring before new Flashcard creator