Few tweaks to aid syntax convention