More changes

Some cleanup