Addressed @andrewor14's comments