Refactor exit handling
New keepalive behavior