Few small optimizations