cleaing up the develop branch a little
Do it properly