Code optimizations
Cleanup