further tidying up, styling, licensing++ part II