I think I've refactored it enough