Refinement & cleanup.