Incorporate review comments by kelsey.