Does minor clean-ups