Cleaned up more code yet.

It's now human-readable! Yay! :D