Refactor - clean up redundant callback code in higher level functions.