Minor header refactoring, picked up some Copyright notice tweaks