Improve quality code with PullReview #2