finish refactor of base activity