Merging with branch scratch and cleaning the code