Refinements/Cleanup.