Cleanup
Add some changes