closes #1419
refactor of thread tools