put in proper order

See: arrange, fix