re-factoring without testing