Reorganize methods into sections