Reorganize some member variables and update a comment.