Made syntax more consistent
Add grammar