Minor method reordering