Mostly code reord