Minor: Code Optimizations