Comments, again, and eliminate unneeded names