Much Needed Cleanup.

Still as simple to load as before.