Some minor changes, mostly cleanup.