Correct and normalising version control