MBH: grammar cleanup