Simplify
Update changelog