Nested levels

Reduce number of nested levels, sometimes by creating a new method.