Removed reading from file and integrated data into main