General design cleanup.