Feature/better reset data

Slightly better reset_data task.