Reorganize and comment