Small style optimizations