Fixing leaked variables

Sorry for the whitespace commit too. Figured it wasn't too distracting.