License text in a couple of classes and changes to apply coding styles