minor: reordering methods