style cleanup
micro-optimizations