Code refactoring prompted when looking at #8