Minor optimization
Optimizations