#4151 Code tidy + licence update