Refactors Drawing