Code cleanup and comment.