i think you're is right but to prevent edit wars maybe you can post a rewrited version on this talk page to see how people reacts to your changes