Improved UI: house-cleaning