edit variable names and comments