Tweaked use of datasets, use of logger and spelling