update private functions with an _
Remove unnecessary setTimeouts