Cleaning and tweaking