Resolved code review comments.