Update copyright years

Also - a lot of whitespace clean up.