Underscore unexposed

Underscoring any variables that shouldn't be publicly exposed to the user.  There shouldn't be any functionality changes.