updates to reflect Alan's comments for the style-change pull request