More micro optimizations