More cleanups - whitespace, copyrights, etc.