more cleanup of grammar