More changes to neatness.