Code Review Changes

- Made modifications from Taylor's comments

#1960