Getting some things cleaned up.