Cleanup
More refinements