light code cleanup.