More refactoring out MainActivity dependencies