Change code by codeReview corrents