Minor clean up
Update changelog