Incorporated feedback from 2nd reviewboard review.