small syntactic improvements.