Avoid multiple var statements and variable hoisting #91