Refactoring
Adding Guice for dependency injection