[FIX] Fixed part of code review