More re-factoring