researched: code cleanup.