Some more changes
Cleanup