Minor Optimizations

It runs a little faster, works a little harder.