2-clause
updated copyright date, whitespace cleanup.