Update comments
Improve guice injection
Remove logger