Some cleanup.
Should hopefully make some things better.