Minor code cleanup.
Code reorg.