#1 some cleanups, integration of dagger and event bus, use some things of u2020 template