optimizations, minor