Reordering of implementation section