Update: style optimizations