Cleaned up configuration in Guice Config