Cleanup

- Visual cleanup, just moved some stuff that I noticed was out of
place. Nothing of note.