General code cleanups

I'm mostly removing unnecessary parentheses and swapping out None
for empty string where it makes sense.