Some more minor optimization
Some more minor optimization
Merge