Comment body improvement, rename some helpers function