Made some changes for review feedback.