code chore
minor optimizations