62 [Sophie] Refactoring, absolving my sins of not testing first