changes made per code review on Monday