Clean up syntax and do some simple refactoring.
Update copyright year.