Cleanup some parts.

Just some minor changes I didn't want to discard.