Comments, function renaming