Tidying up and arbitrary way point.