More cleanup on numpy notebook