few more optimizations