Bug fixes.
Underscorize variables. Remove unnecessary variables.