minor optimizations
minor optimizations