also clean up data parsing