Changed variable name, editted comments