Cleanup
Update change log