Refactor to reflect generalization of function.