Do less unnecessary work!

Also less nesting!
Also it looks pretty icky.