Cleaning, Standardization

Tomorrow we'll agree about more things to avoid merge conflicts...