final refactoring, now Vidada runs with Guice