More improvements
Cleanup