Further optimizations :D