Addressing comments in the previous commit.