a bit cleanup.