Documentation
further tidy ups