Font Stream clean up

Just wanted to make this a little simpler.