Clean up with the previously added helper function.