proper data file (for now)
cleaned up code