Refactor verifier to use Guice

Added a TODO