Cleaned up linter issues.
More linter issues.
Fixed more linter problems.