more syntactic cleanup