Minor syntax adjustments