Cleanup: make some variables private.