Processed review comments + did minor cleanup on the heartbeat monitor.