Cleanup and refine