Cleaned up the heartbeats a little more