Reorganize and more comments