SOme small syntax tweaks