edited variables and comments