some cosmetic changes to data file and model