More changes

Some cosmetic work