Just making a clean commit of the source for some adjustments after