Improve notebooks