Updating suicide logic.
Cleaning up code.