Renaming variables, add comments