- some small optimizations