Update to make adjustments based on PR feedback.