Kilo : More code cleanup and consolidation.

--Tom