Added better cleaning