Modifed per code review requests.