Optimizations. Cleanup.