reordering of methods + method merging