Minor: Code optimizations