Made corrections based on comments of previous commit.