cleanup/refactor in client heartbeat implementation

The name is a bit confusing. What about alive?