Code cleanup and begin of a contributing guide
Merging