minor optimizations/cleanups