code cleanup, faster heartbeats