Code clearing

~~merge after my last pull-req~~

just merge this one