Another refactoring in Activities