minor improvements due to cache efficiency.

feel like I did all I can do...