Changes suggested in review