Reduce nested levels.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Reduce nested levels.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Reduce nested levels.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Fix wrong refactoring.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Merge pull request #799 from Tithugues/nestedLevels

Nested levels