Reord of some code