Made some minor adjustments from previous commit.