More code reordering