minor syntaxual improvements