MODE-2088 Made a few corrections based upon code review feedback.