Making more juice, refactoring a lil