more dumb optimizations