Little re-factoring