Slight tidying to do with mouse events and drawing