Cleans up code a bit, drilling into notebook still doesn't work as desired