#8 A bit of cleaning up and externalizing the DataSource.groovy