update the source according to the review comments