Addressing review #2 feedback.