script: Fix indents, refix indents, split stuff

Fixes that I knew I did before but managed to revert after I rebased.