Very slight re-factoring