QOL (?) Changes

Nothing that will significantly change the code, cleaned up a lot and
made it more readable.