Code cleanup + button 'Clear'