@nigelbabu Do we agree that this method belongs to the ActivityDetail class?

I understand that refactoring just this method feels weird when you look at all these dangling functions in the file, but that's normal when you're doing small steps. The code looks worse before it gets better. Given the size of the codebase, we'll never stop and refactor everything at once. But we need to start from somewhere :P