Refactoring: created drawing module