Completed making factors inline