#2: address pr comments.