Steve Groom last refactoring