Refactoring
Integrated into thread list loader
Please enter the commit message for your changes. Lines starting