Improved grammar and syntax