Clean up spec
Update change log [skip ci]