Tidied up Sketch.java