Changed accordingly @dlong500 suggestions. Refs #1585