function rename and comments