update licenses again due to added space that made diff report false positive change on all files
more code cleaning and sync with base module files