Address BLuong's feedback