rename function and comment