Refactored code. Introduce Guice. Done issues #4 and #5