Updated data file
Tidy up