Tidying up and more doc