Upgrading Copyright year, cleaning up some spacing and indentation.