Made modifications from code review

#1960