Code clearing

merge after my last pull-req