Refactoring with Guava