Refactored helper functions into a Utils.hs file and updated data files with latest data from Tony's master branch.