Corrected use of datasets
Trivial tidy ups