small optimizations
small optimizations