Issue #90: I was a bit sloppy with global scope, so cleaning that up to try to save resources