Small amend and clean up