Cleaned up a couple errant functions, refactor

* Commented about a line to *not* remove.
* BaseRenderer function renamed
* Removed unused function from Tokenizer