More Style Optimizations