clean up data and fix toastr