Aligning copyright license headers
Minor changes in code