minor syntactic changes