fix formatting
fixing license headers
Merge branch 'cleanups'