Clean up lint errors.

Done