Minor changes
Cleanup