> The code looks more readable, but the above two "if" code blocks look very similar, not sure if the code refactoring will be >  needed. 

> 

> What do you think about this? Firo and Kazu.

Hi, thanks for reviewing. I will update the patch to fix this code alignment issue.

Thanks,

Firo