Just some small tweaks.

Was poking around in some of the places where I don't spend much time.
This should be slightly faster . . . fewer method calls