Renamed and refactored method in responsed to comments

(refs #4095)