Restructure and add optional eager spin down