Code cleanup.
Split callouts and heartbeats into their own classes.