Making additional changes for second review feedback.