Cleanded code