Small reordering of methods