A bit more cleaning