A little optimizations