Addresses code review comments.