minor: optimizations