Some re-factoring.