Simple grammar and consistency tweaks