clean ups and comments.