Did a small cleanup.