Small tweaks to syntax