Optimized code a bit
And optimized even more