cleanup in response to comments.