Refactored out the rest Guice