"refactoring"

renamed variables, moving functions, editing comments