Do not use magic characters  so much

also fix typo and prepare for the next feature in grammar section