Cleaning my branch

More to come very very soon