Refactoring, first draw