Small refactoring, added output for unknown licenses, grooming, comments