clean up some whitespace
Add threading

+ add threading
• clean up argument overloads/function definitions