Further tidy up of drawing