HY-1518 Clarify code based on feedback.