Small Cleanup

Improved the spawn functionality.