Tidying up before 1.0 release