Sketch cleanups