Cleanup and micro-optimizations
Crazy, one previous optimization was regression