Minor cleanup of syntax