Some cleanup changes;