Efficiency improvements
Cleanup