Code re-ordering