Write methods in Python, call them from notebook. This works well in collaboration and team members can just fork notebook or the merges are kind of trivial.

This makes the notebook just a convenient way to visualize or share with non team members.

Or give Emacs Org mode a try :)