Just little optimizations