Massive Refactoring for Better Activity Flow