Get rid of inappropriate underscores