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>
Standardize names of functions.

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

Nested levels