further tidying up, styling, licensing++