minor
minor optimizations