Aesthetics - cleaned up nesting