Cleaning up and untokenizing