Fix variable name, remove commented out code