clean up the old code class var pollution. minor reformat.