refactor drawings