Code cleaning & license headers