Continue guice refactoring
continue cleanup refactoring