More changes/cleanup