some small changes according to the review comments