Slides & tidied-up code