Cleaner : Some improvements!