More clean

.