Reform data structure