Correct team2 grammars

psGrammar/challenge/team2/bill.jsgf

@@ -2,12 +2,8 @@
 grammar bill;
 public <command> = ( <setupbill> | <thatscorrect> | <correction> );
 
-<setupbill> = [tiago] [please] (set up the ( bill | check ) | (could i have the) ( bill | check ) | i ( would like | want ) (to pay) | (can i pay) | bill ) [now] [please];
+<setupbill> = (([tiago] [please]) ((set up the ( bill | check )) | (could i have the ( bill | check )) | (i ( would like | want ) to pay) | (can i pay) | bill) [now] [please]);
+<thatscorrect> = ( yes | ([yes] you got that ( right | correct )) | ([yes] that is ( right | correct )) );
+<correction> = ([[no] ((i ordered) | (there are))] <drink> [[and] <drink>] [[and] <drink>]);
 
-
-<thatscorrect> = ( yes | [yes] (you got that) ( right | correct ) | [yes] (that is) ( right | correct ) );
-
-
-<correction> = [ [no] (i ordered) | (there are) ] <drink> [ [and] <drink>] [ [and] <drink>];
-
-<drink> = [ ( (a | one) [(bottle | cup | can) of] ) | ((two | three) [(bottles | cups | cans) of]) ] ( coke | malz | lemonade | water | ice tea | coffee );
+<drink> = ([ (((a | one) [(bottle | cup | can) of] )) | ((two | three) [(bottles | cups | cans) of]) ] ( coke | malz | lemonade | water | (ice tea) | coffee ));

psGrammar/challenge/team2/task5.jsgf

 #JSGF V1.0;
 grammar task5;
 
-public <command> =  [please] <verb> <location> [please];
+public <sentence> = [<robot>] [please] <command> <location>;
 
-<robot> = (tiago | tobi);
-
-<verb> = bring [me] [to] | take me [to] | where is | i want [to go to] | where [(can|do) i] [find] ;
-
-<location> = [the] <bathroom> | table <table> | [the] <cashRegister> ;
+<robot> = (tiago|tobi);
+<command> = (((bring | take) me to) | (where (is | can i find )) | i want to go to);
+<location> = (the <bathroom> | table <table> | the <cashRegister>);
 <bathroom> = (bathroom | toilet);
-<cashRegister> = (cashier | [cash] register);
-
-<table> = a | b | c ;
-
+<cashRegister> = (cashier | ([cash] register));
+<table> = (a|b|c);