Refactor GenericCard, removed TODO item