Clean-up / Nesting

Code clean-up.
Remove unnecessary nesting.