[Updated]Fixed respawn timer to 5 mintues. Also cleaned up the code.

Change-Id: I7578108d8738fbd2dd3709813cc0ad162a97c08f
Merge "[Updated]Fixed respawn timer to 5 mintues. Also cleaned up the code." into unstable