Refactor data format
Merge branch 'transform'