code cleanup, implemented guice, moved code out of activator