Code cleaning
Merging