Refactoring gcards illustrations