Made changes to pull request per comments by cgay.