Continued comment thread refactoring (in progress)