General cleanup and comments.