Fix lint errors.
Cleanups.