Variable cleanup. Make consistent use of the $ prefix

There are a couple of places in our code where we're setting jQuery objects but not prefixing the variable with $. This patch fixes those up and also locally scopes a variable.