Tidied up Incubate package