[FIX] review comments