Tweak comment
Obsolete comment gone
Change var names