Some more cleaning :)