Some optimizations :)