Re-factoring baby