Come cosmetic changes.

Also name no longer reachable through tab.