clean up controling variables, rename for namespace.