Changes suggested in review

Changes suggested in review