Yeah, that is the cleaner way to do this. I was thinking about the possibility of outputting to files, and then I realized I'm probably not going to be outputting tokens to file.

But this is all temporary code anyways, so I'm leaving it.