Clean-up of internal function order.