Rewrite to decrease number of nested levels.

Hi,

Here are some rewrites to decrease the number of nested levels.
Are this kind of rewrites ok for you please ?