minor method reordering