General cleanup

Less %, more .format() !

Also remove some debug stuff.
General cleanup

Now that I know how .format() works, it makes sense to use it more.
General cleanup

Put all the stuff that doesn't need to be edited above the stuff that
does.