Minor Performance Optimizations