Refactor to clean up interactions.