refactor for threading

Coding standards.