syntactic cleanup