Optimized code a bit more.