allow restarting of multiple nodes
minor cleanup