Sprint 12b - Tidy up (partial)