* minor optimizations