minor syntactic improvements