More cleaning and refining

No material changes