2-clause
copyright update
clean up trailing whitespace