Clean-up and add a comment.

[ci skip]