Addressing comments on previous commit.