tidied up some syntax.