Cleanup and added comment.