Reorder and resolved some comments