More re-factoring.