Updates based on peer feedback, minor renaming of method