Fix comment count position
Fix function name