Tiedied up grammar a bit