commenting and code cleanup.