Modify structure and add some comments