move formatting of data to a separate module file
merge changes on master to play nice with formatter update