More little optimizations