Lunchtime refactoring