More ipython-notebook refactoring