Fixing some coding-style

Miscommitted dates in copyright, and fixed a couple of
spacing issues in my preivous commit.