Cleaning up. Adjusting comments.