Reorganizing method sections to more closely match interface