Add comments and minor refactor - refs #7255