Restructure continuous infection functions