Cleanup of the Guice module
Raw type isn't needed anymore
Merge pull request #16 from akkie/master

Cleanup of the Guice module