Update license headers to reflect modifications.
Cleanup and formatting of source per conventions.