Optimizations and style changes