Applied changes according to code review