Don't align stuff manually

Is this better or worse?

Also, there are probably a few bugs in this PR.