[FIX] fixed code review comments