Did a little code cleanup.