Updated infusion process
Cleaning up some code