Guice refactoring