cleanup and comments.