Fix: Errors picked up by JSHint - couple of leaking variables and
whitespace issues