Optimizations
Some more improvement