rm extra call to spawn and minor cleanups