Minor syntax tweaks