More rearranging, comments cleaning, marking things for possible deletion.