Reworked CodeReview according to the most remarks