Release 1.0 tidying up