Refactored the code that uses Google Guice.