Some commenting and cleanup.