A small amount of re-factoring.