Some clean up.  externalize a few more variables