small changes due to comments on PR