Optimizations further