Small improvements
Cleanup