Added improvement: Clean