Clean-up and comments.