Static variables shouldn't be static.

Some additional minor cleanup.
No need for static variables. Variables have file scope.