Refactors drawing to support more repeat patterns