Clean up and refinements.