added guice injection, removed resource-inheritance
added some java 7 sugar