Update comments / code cleanup.