Simplify grammar

see #1
Improve sample specs