Clean up over-nested code

[nilederg]

These ones were really bugging me, I had to fix them

[nilederg]

Odd that it shows old commits in here, but rest assured those aren't actually affecting the PR.

[bend-n]

you need to rebase