Lint cleanup.
Checking in the rest of the original files.