cleanup and finalise for pull request