Add comment and function name modifications