Quick bit of cleanup.
A bit more caching.