various cleanup

Just some spring cleaning; probably best to `?w=1` to ignore whitespace