Finish data struct optimize